api/eqpt_views.py

@@ -201,7 +201,7 @@ def get_screen_data(point=None, point_id=None):

                 
              

                         # ipuis = ipuis.exclude(last_submit_at__range=(start_dt, end_dt), temperature__gt=0.0, temperature__lte=settings.FEVER_TEMPERATURE)
              

                 
              

                -        ipuis = [{**ipui.data, **{
              

                +        ipuis = [{**ipui.screen_data, **{
              

                             field.get('key', ''): protect_user_privacy(field) for field in ipui.fields}} for ipui in ipuis]
              

                         reminds = [{
              

                             'name': ipui.get('name'),
              

equipment/models.py

@@ -267,6 +267,31 @@ class IsolationPointUserInfo(BaseModelMixin):

                         }
              

                 
              

                     @property
              

                +    def screen_data(self):
              

                +        return {
              

                +            'pk': self.pk,
              

                +            'point_id': self.point_id,
              

                +            'user_id': self.user_id,
              

                +            'fields': self.fields,
              

                +            'observed_days': self.observed_days,
              

                +            'temperature_has_upload': self.temperature_has_upload,
              

                +            'user_status': self.user_status,
              

                +            'temperature': self.temperature,
              

                +            'dry_cough_status': self.dry_cough_status,
              

                +            'weak_status': self.weak_status,
              

                +            'sore_throat_status': self.sore_throat_status,
              

                +            'smell_taste_loss_status': self.smell_taste_loss_status,
              

                +            'diarrhea_status': self.diarrhea_status,
              

                +            'blood_oxygen_saturation': self.blood_oxygen_saturation,
              

                +            'is_filled': self.is_filled,
              

                +            'last_submit_at': self.last_submit_at,
              

                +            'last_report_time': tc.local_string(utc_dt=self.last_submit_at, format='%m-%d %H:%M') if self.last_submit_at else '',
              

                +            'remark': self.remark or '',
              

                +            'antigen_result': self.get_antigen_result,
              

                +            'detect_at': tc.local_string(utc_dt=self.detect_at, format='%m-%d %H:%M') if self.detect_at else '',
              

                +        }
              

                +
              

                +    @property
              

                     def userdata(self):
              

                         try:
              

                             point = IsolationPointInfo.objects.get(point_id=self.point_id)